Autogenerated HTML docs for v1.5.3-rc2-29-gc4640
diff --git a/config.txt b/config.txt index a850d55..dd98d95 100644 --- a/config.txt +++ b/config.txt
@@ -286,8 +286,8 @@ messages by lauching an editor uses the value of this variable when it is set, and the environment variable `GIT_EDITOR` is not set. The order of preference is - `GIT_EDITOR` environment, `core.editor`, `EDITOR` and - `VISUAL` environment variables and then finally `vi`. + `GIT_EDITOR` environment, `core.editor`, `VISUAL` and + `EDITOR` environment variables and then finally `vi`. core.pager:: The command that git will use to paginate output. Can be overridden
diff --git a/git-config.html b/git-config.html index 65d4bbd..078501e 100644 --- a/git-config.html +++ b/git-config.html
@@ -1020,8 +1020,8 @@ messages by lauching an editor uses the value of this variable when it is set, and the environment variable <tt>GIT_EDITOR</tt> is not set. The order of preference is - <tt>GIT_EDITOR</tt> environment, <tt>core.editor</tt>, <tt>EDITOR</tt> and - <tt>VISUAL</tt> environment variables and then finally <tt>vi</tt>. + <tt>GIT_EDITOR</tt> environment, <tt>core.editor</tt>, <tt>VISUAL</tt> and + <tt>EDITOR</tt> environment variables and then finally <tt>vi</tt>. </p> </dd> <dt> @@ -1864,7 +1864,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 20-Jul-2007 10:27:37 UTC +Last updated 22-Jul-2007 09:33:18 UTC </div> </div> </body>
diff --git a/git-rev-list.html b/git-rev-list.html index ed8c7f3..238ecce 100644 --- a/git-rev-list.html +++ b/git-rev-list.html
@@ -291,7 +291,8 @@ [ --cherry-pick ] [ --encoding[=<encoding>] ] [ --(author|committer|grep)=<pattern> ] - [ --regexp-ignore-case ] [ --extended-regexp ] + [ --regexp-ignore-case | \-i ] + [ --extended-regexp | \-E ] [ --date={local|relative|default|iso|rfc|short} ] [ [--objects | --objects-edge] [ --unpacked ] ] [ --pretty | --header ] @@ -574,7 +575,7 @@ </p> </dd> <dt> ---regexp-ignore-case +-i, --regexp-ignore-case </dt> <dd> <p> @@ -582,7 +583,7 @@ </p> </dd> <dt> ---extended-regexp +-E, --extended-regexp </dt> <dd> <p> @@ -1124,7 +1125,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jul-2007 02:09:52 UTC +Last updated 22-Jul-2007 09:33:18 UTC </div> </div> </body> diff --git a/git-rev-list.txt b/git-rev-list.txt index 08e7573..0430139 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt
@@ -27,7 +27,8 @@ [ \--cherry-pick ] [ \--encoding[=<encoding>] ] [ \--(author|committer|grep)=<pattern> ] - [ \--regexp-ignore-case ] [ \--extended-regexp ] + [ \--regexp-ignore-case | \-i ] + [ \--extended-regexp | \-E ] [ \--date={local|relative|default|iso|rfc|short} ] [ [\--objects | \--objects-edge] [ \--unpacked ] ] [ \--pretty | \--header ] @@ -227,11 +228,11 @@ Limit the commits output to ones with log message that matches the specified pattern (regular expression). ---regexp-ignore-case:: +-i, --regexp-ignore-case:: Match the regexp limiting patterns without regard to letters case. ---extended-regexp:: +-E, --extended-regexp:: Consider the limiting patterns to be extended regular expressions instead of the default basic regular expressions. diff --git a/gitignore.html b/gitignore.html index 2409b7a..33da1ff 100644 --- a/gitignore.html +++ b/gitignore.html
@@ -281,12 +281,25 @@ pattern.</p> <p>When deciding whether to ignore a path, git normally checks <tt>gitignore</tt> patterns from multiple sources, with the following -order of precedence:</p> +order of precedence, from highest to lowest (within one level of +precedence, the last matching pattern decides the outcome):</p> <ul> <li> <p> -Patterns read from the file specified by the configuration - variable <em>core.excludesfile</em>. +Patterns read from the command line for those commands that support + them. +</p> +</li> +<li> +<p> +Patterns read from a <tt>.gitignore</tt> file in the same directory + as the path, or in any parent directory, with patterns in the + higher level files (up to the root) being overriden by those in + lower level files down to the directory containing the file. + These patterns match relative to the location of the + <tt>.gitignore</tt> file. A project normally includes such + <tt>.gitignore</tt> files in its repository, containing patterns for + files generated as part of the project build. </p> </li> <li> @@ -296,13 +309,8 @@ </li> <li> <p> -Patterns read from a <tt>.gitignore</tt> file in the same directory - as the path, or in any parent directory, ordered from the - deepest such file to a file in the root of the repository. - These patterns match relative to the location of the - <tt>.gitignore</tt> file. A project normally includes such - <tt>.gitignore</tt> files in its repository, containing patterns for - files generated as part of the project build. +Patterns read from the file specified by the configuration + variable <em>core.excludesfile</em>. </p> </li> </ul> @@ -329,7 +337,8 @@ <p> An optional prefix <em>!</em> which negates the pattern; any matching file excluded by a previous pattern will become - included again. + included again. If a negated pattern matches, this will + override lower precedence patterns sources. </p> </li> <li> @@ -403,7 +412,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jul-2007 02:10:00 UTC +Last updated 22-Jul-2007 09:33:20 UTC </div> </div> </body>
diff --git a/gitignore.txt b/gitignore.txt index ea79d74..9c83095 100644 --- a/gitignore.txt +++ b/gitignore.txt
@@ -18,21 +18,26 @@ When deciding whether to ignore a path, git normally checks `gitignore` patterns from multiple sources, with the following -order of precedence: +order of precedence, from highest to lowest (within one level of +precedence, the last matching pattern decides the outcome): - * Patterns read from the file specified by the configuration - variable 'core.excludesfile'. - - * Patterns read from `$GIT_DIR/info/exclude`. + * Patterns read from the command line for those commands that support + them. * Patterns read from a `.gitignore` file in the same directory - as the path, or in any parent directory, ordered from the - deepest such file to a file in the root of the repository. + as the path, or in any parent directory, with patterns in the + higher level files (up to the root) being overriden by those in + lower level files down to the directory containing the file. These patterns match relative to the location of the `.gitignore` file. A project normally includes such `.gitignore` files in its repository, containing patterns for files generated as part of the project build. + * Patterns read from `$GIT_DIR/info/exclude`. + + * Patterns read from the file specified by the configuration + variable 'core.excludesfile'. + The underlying git plumbing tools, such as gitlink:git-ls-files[1] and gitlink:git-read-tree[1], read `gitignore` patterns specified by command-line options, or from @@ -49,7 +54,8 @@ - An optional prefix '!' which negates the pattern; any matching file excluded by a previous pattern will become - included again. + included again. If a negated pattern matches, this will + override lower precedence patterns sources. - If the pattern does not contain a slash '/', git treats it as a shell glob pattern and checks for a match against the
